Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Underbarrel Gun Attachments #3825

Merged
merged 70 commits into from
Jan 6, 2025

Conversation

Gristlebee
Copy link
Contributor

@Gristlebee Gristlebee commented Nov 22, 2024

About The Pull Request

Adds underbarrel gun attachments. Current roster is the underbarrel shotgun, e-gun, flamethrower, flaregun, riot grenade launcher, and 40mm grenade launcher. The first five can be bought from the outpost cargo.

Attachment removal now needs to be on harm intent in addition to the alt-click to avoid action conflicts.

Underbarrel guns can be fired/reloaded/interacted with by swapping the fire select to underbarrel.

Cleans up the riot grenade launcher code a bit.

Fixes runtimes caused by canceling attachment removal without selecting an attachment, and dropping cells from e-guns with an open latch.

Underbarrel gun sprites are recolors of Rye-rice's underbarrel grenade launcher.

Why It's Good For The Game

Adds some more customization and personalization options to a players loadout, and I think it's neat.

Changelog

🆑 Gristlebee, Rye-rice
add: Underbarrel guns
add: Hand attachment removal is bound to alt-click on harm intent.
fix: Grenade launcher code
fix: Runtimes
/:cl:

@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Dec 4, 2024
Copy link
Contributor

github-actions bot commented Dec 4, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Dec 4, 2024
@github-actions github-actions bot added the Merge Conflict Use Git Hooks, you're welcome. label Dec 29, 2024
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions github-actions bot removed the Merge Conflict Use Git Hooks, you're welcome. label Dec 30, 2024
Copy link
Member

@FalloutFalcon FalloutFalcon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small questions but otherwise pretty happy with the code and a good feature!

code/modules/projectiles/gun.dm Show resolved Hide resolved
code/modules/projectiles/guns/ballistic.dm Show resolved Hide resolved
code/modules/projectiles/guns/ballistic.dm Show resolved Hide resolved
@github-actions github-actions bot requested a review from FalloutFalcon January 3, 2025 21:51
@github-actions github-actions bot requested a review from FalloutFalcon January 4, 2025 21:29
@FalloutFalcon FalloutFalcon added this pull request to the merge queue Jan 6, 2025
Merged via the queue into shiptest-ss13:master with commit fb8e245 Jan 6, 2025
16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code change Watch something violently break. DME Edit Sprites A bikeshed full of soulless bikes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants